Get the correct parent when generating my type.

2000-10-17    <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
	parent when generating my type.

	* gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
	POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.

diff --git a/ChangeLog b/ChangeLog
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f1ab45655949fd16579eeb403e0dd714eb51e049..d0896119d337ea65999b182a5cc17bbcfb76859d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-10-17    <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_type): Get the correct
+       parent when generating my type.
+
+       * gtk/gtkmarshal.list: Added four more marshallers: INT:NONE,
+       POINTER:NONE, POINTER:POINTER, and POINTER:POINTER,INT.
+
 2000-10-16    <jrb@redhat.com>
 
        * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Move

diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index b3c828308bc55abe6162900e89020111e8a98fa5..b82fff618d70d1f892a66ac68752ea1b45f7b8f1 100644 (file)
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -5,9 +5,13 @@ BOOL:POINTER,INT,INT
 BOOL:POINTER,INT,INT,UINT
 BOOL:POINTER,STRING,STRING,POINTER
 ENUM:ENUM
+INT:NONE
 INT:POINTER
 INT:POINTER,CHAR,CHAR
 INT:OBJECT,BOXED,POINTER
+POINTER:NONE
+POINTER:POINTER
+POINTER:POINTER,INT
 NONE:BOOL
 NONE:BOXED
 NONE:ENUM

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index b3c828308bc55abe6162900e89020111e8a98fa5..b82fff618d70d1f892a66ac68752ea1b45f7b8f1 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -5,9 +5,13 @@ BOOL:POINTER,INT,INT
 BOOL:POINTER,INT,INT,UINT
 BOOL:POINTER,STRING,STRING,POINTER
 ENUM:ENUM
+INT:NONE
 INT:POINTER
 INT:POINTER,CHAR,CHAR
 INT:OBJECT,BOXED,POINTER
+POINTER:NONE
+POINTER:POINTER
+POINTER:POINTER,INT
 NONE:BOOL
 NONE:BOXED
 NONE:ENUM

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 36734378afa17d9c69976438c92b010dcac9efd0..24829803a3a286063596c5f308a1ca9a2ad827d6 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -90,7 +90,7 @@ gtk_tree_store_get_type (void)
        NULL
       };
 
-      tree_store_type = g_type_register_static (GTK_TYPE_TREE_MODEL, "GtkTreeStore", &tree_store_info);
+      tree_store_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeStore", &tree_store_info);
       g_type_add_interface_static (tree_store_type,
                                   GTK_TYPE_TREE_MODEL,
                                   &tree_model_info);